Integrate Chucker for network troubleshooting #22381
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Document the plan for integrating Chucker HTTP inspector into the app for production use (disabled by default, user opt-in for troubleshooting). Research findings: - 7 network paths identified, 5 are OkHttp-based (interceptable) - OkHttpClientModule is the main path covering ~90% of traffic - 2 HttpURLConnection usages cannot be intercepted (edge cases) - Wrapper interceptor approach recommended for runtime enable/disable
…tion Add an OkHttp interceptor that will serve as the foundation for HTTP traffic inspection via Chucker. The interceptor is disabled by default and can be toggled by users in the Help screen for troubleshooting. Changes: - Add `TrackNetworkRequestsInterceptor` in FluxC with preference interface - Add `TrackNetworkRequestsModule` to inject interceptor into OkHttpClient - Add preference `IS_TRACK_NETWORK_REQUESTS_ENABLED` in `AppPrefs` - Add toggle UI in Help screen below "Contact email"
Add Chucker v4.2.0 as the HTTP traffic inspection backend for the Track Network Requests feature. The interceptor now delegates to ChuckerInterceptor when the feature is enabled. Configuration: - 1-hour retention period - Sensitive headers redacted (Authorization, Cookie, Set-Cookie, X-WP-Nonce) - Notifications disabled (custom UI entry point to be added) - Max content length: 250KB Changes: - Add Chucker dependency to libs.versions.toml and build.gradle files - Update TrackNetworkRequestsInterceptor to create and use ChuckerInterceptor - Simplify TrackNetworkRequestsModule (Chucker is now an implementation detail)
Add a button in the Help screen that launches Chucker's traffic inspector UI. The button is only visible when Track Network Requests is enabled. Changes: - Add `viewNetworkRequestsButton` to help_activity.xml - Add `view_network_requests` string resource - Update `setupTrackNetworkRequestsToggle()` to show/hide button and handle click
…cking Implement retention period selection when enabling Track Network Requests, with dialog-based enable/disable flow for better user communication. Features: - Retention period options: 1 Hour, 1 Day, 1 Week, Until Cleared - Enable dialog with privacy explanation and retention picker - Disable dialog with guidance on clearing logs manually - "View Network Requests" now shows current retention period Technical changes: - Add `NetworkRequestsRetentionPeriod` enum with stable int values for persistence - Interceptor lazily creates and recreates ChuckerInterceptor when retention changes - Add `dialog_title_with_message.xml` layout for dialogs with description text - Use `setSwitchCheckedSilently()` to prevent listener loops on cancel Changes: - Add retention period preference to `AppPrefs` and `AppPrefsWrapper` - Update `TrackNetworkRequestsPreference` interface with `getRetentionPeriod()` - Add enable/disable dialogs to `HelpActivity` - Update `help_activity.xml` with container showing retention info - Add string resources for retention options and dialog messages
Enable network request tracking for OAuth login flows by adding interceptors to WPcomLoginClient. Move tracking preferences to UndeletablePrefKey so they persist across logout/login cycles, allowing users to troubleshoot login issues. Changes: - Add interceptors to WPcomLoginClient for OAuth token exchange - Move IS_TRACK_NETWORK_REQUESTS_ENABLED to UndeletablePrefKey - Move TRACK_NETWORK_REQUESTS_RETENTION_PERIOD to UndeletablePrefKey - Add documentation for Chucker export API options
Integrates GutenbergKit's WebView network requests with Chucker by replaying them through OkHttp. This allows editor network traffic to appear alongside native app requests in the unified log. Changes: - Add `GutenbergKitNetworkLogger` to replay JS fetch requests through OkHttp - Add `isNetworkLoggingEnabled` to `FeatureConfig` and `EditorConfiguration` - Wire up `NetworkRequestListener` in `GutenbergKitActivity` - Update GutenbergKit to PR #238 branch with network logging support
Remove verbose debug logging used during development. Keep error logging for diagnosing failures.
Hide the Track Network Requests section in Help behind an experimental feature flag. When the flag is disabled, the section is completely hidden. When trying to disable the flag while tracking is enabled, show an error dialog instructing the user to disable tracking first. Changes: - Add NETWORK_DEBUGGING to ExperimentalFeatures.Feature enum - Add validation in ExperimentalFeaturesViewModel to prevent disabling the flag while tracking is active - Add NetworkDebuggingErrorDialog composable for the error state - Update HelpActivity to check the feature flag before showing section - Wrap track network requests UI in a single container for cleaner visibility management
Add suppress annotations for: - LongMethod in ExperimentalFeaturesActivity.onCreate (Compose UI) - TooGenericExceptionCaught in GutenbergKitNetworkLogger (intentional) - MagicNumber in GutenbergKitNetworkLogger (HTTP status codes)
Duplicate the network tracking functionality from HelpActivity to the new Compose-based SupportActivity (behind MODERN_SUPPORT flag). Also update help_activity.xml to show retention info under the toggle instead of under the view button, for consistency between both UIs. Changes: - Add NetworkTrackingState and DialogEvent to SupportViewModel - Add NetworkTrackingToggleItem composable to SupportScreen - Add dialog handling and Chucker navigation to SupportActivity - Restructure help_activity.xml for consistent retention info placement
Wire `TrackNetworkRequestsInterceptor` into all wordpress-rs based network clients so their requests are captured when network debugging is enabled. Changes: - `WpApiClientProvider`: Accept interceptors via Dagger `@Named` set - `ApplicationModule`: Pass interceptor to `WpLoginClient` - `DataViewViewModel`: Inject interceptor for `WpComApiClient` - `JetpackConnectionHelper`: Inject interceptor for connection client - `AddSubscribersViewModel`: Inject interceptor for subscriber API - Child ViewModels: Pass interceptor to parent `DataViewViewModel`
GutenbergKit v0.11.0 renamed `NetworkRequest` to `RecordedNetworkRequest` and added a `statusText` field, allowing us to remove our custom HTTP status code mapping. Changes: - Update GutenbergKit version to v0.11.0 - Rename NetworkRequest to RecordedNetworkRequest - Use statusText from RecordedNetworkRequest instead of toStatusMessage()
Replace hardcoded "interceptors" strings with the constant to prevent typos and enable easier refactoring.
Collaborator
Generated by 🚫 Danger |
Contributor
Project dependencies changeslist+ New Dependencies
androidx.lifecycle:lifecycle-livedata-ktx:2.10.0
androidx.palette:palette:1.0.0
androidx.palette:palette-ktx:1.0.0
com.github.chuckerteam.chucker:library:4.2.0
org.brotli:dec:0.1.2
! Upgraded Dependencies
androidx.databinding:viewbinding:8.11.1, (changed from 8.7.3)
org.wordpress.gutenbergkit:android:v0.11.1, (changed from v0.10.2)tree-+--- androidx.databinding:viewbinding:8.7.3
++--- androidx.databinding:viewbinding:8.7.3 -> 8.11.1
++--- androidx.navigation:navigation-compose:2.9.6
+| \--- androidx.navigation:navigation-compose-android:2.9.6
+| +--- androidx.activity:activity:1.8.0 -> 1.10.1
+| | +--- androidx.core:core-ktx:1.13.0 -> 1.16.0
+| | | \--- androidx.core:core:1.16.0
+| | | \--- androidx.lifecycle:lifecycle-runtime:2.6.2 -> 2.10.0
+| | | \--- androidx.lifecycle:lifecycle-runtime-android:2.10.0
+| | | +--- androidx.lifecycle:lifecycle-common:2.10.0
+| | | | \--- androidx.lifecycle:lifecycle-common-jvm:2.10.0
+| | | | \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+| | | \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+| | +--- androidx.lifecycle:lifecycle-viewmodel:2.6.1 -> 2.10.0
+| | | \--- androidx.lifecycle:lifecycle-viewmodel-android:2.10.0
+| | | \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 -> 2.10.0
+| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.10.0
+| | +--- androidx.lifecycle:lifecycle-livedata-core:2.10.0
+| | | \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+| | \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+| +--- androidx.activity:activity-compose:1.8.0 -> 1.10.1
+| | +--- androidx.activity:activity-ktx:1.10.1
+| | | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.1 -> 2.10.0
+| | | | \--- androidx.lifecycle:lifecycle-runtime-ktx-android:2.10.0
+| | | | \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+| | | \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 -> 2.10.0
+| | | \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+| | +--- androidx.compose.runtime:runtime-saveable:1.7.0 -> 1.9.4
+| | | \--- androidx.compose.runtime:runtime-saveable-android:1.9.4
+| | | \--- androidx.lifecycle:lifecycle-runtime-compose:2.9.4 -> 2.10.0
+| | | \--- androidx.lifecycle:lifecycle-runtime-compose-android:2.10.0
+| | | \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+| | \--- androidx.compose.ui:ui:1.0.1 -> 1.9.4
+| | \--- androidx.compose.ui:ui-android:1.9.4
+| | \--- androidx.compose.ui:ui-text:1.9.4
+| | \--- androidx.compose.ui:ui-text-android:1.9.4
+| | \--- androidx.emoji2:emoji2:1.4.0
+| | \--- androidx.lifecycle:lifecycle-process:2.4.1 -> 2.10.0
+| | \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+| \--- androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2 -> 2.10.0
+| \--- androidx.lifecycle:lifecycle-viewmodel-compose-android:2.10.0
+| \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
-+--- project :libs:image-editor
-| \--- androidx.databinding:viewbinding:8.7.3 (*)
++--- project :libs:analytics
+| \--- androidx.preference:preference:1.2.1
+| \--- androidx.appcompat:appcompat:1.1.0 -> 1.7.1
+| \--- androidx.fragment:fragment:1.5.4 -> 1.8.9
+| \--- androidx.loader:loader:1.0.0
+| \--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.10.0
+| +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.10.0
+| | \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+| \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
-+--- project :libs:editor
-| \--- org.wordpress.gutenbergkit:android:v0.10.2
-| +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21 -> 2.2.10 (*)
-| +--- androidx.core:core-ktx:1.13.1 -> 1.16.0 (*)
-| +--- androidx.appcompat:appcompat:1.7.0 -> 1.7.1 (*)
-| +--- com.google.android.material:material:1.12.0 (*)
-| +--- androidx.webkit:webkit:1.11.0 -> 1.14.0 (*)
-| +--- com.google.code.gson:gson:2.8.9 -> 2.13.2
-| | \--- com.google.errorprone:error_prone_annotations:2.41.0
-| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2 (*)
-| \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 -> 2.2.21 (*)
++--- project :libs:image-editor
+| \--- androidx.databinding:viewbinding:8.7.3 -> 8.11.1 (*)
-+--- project :libs:fluxc
-| +--- androidx.room:room-runtime:2.8.3
-| | \--- androidx.room:room-runtime-android:2.8.3
-| | +--- androidx.annotation:annotation:1.9.1 (*)
-| | +--- androidx.annotation:annotation-experimental:1.5.0 -> 1.5.1 (*)
-| | +--- androidx.arch.core:core-runtime:2.2.0 (*)
-| | +--- androidx.collection:collection:1.5.0 (*)
-| | +--- androidx.room:room-common:2.8.3
-| | | \--- androidx.room:room-common-jvm:2.8.3
-| | | +--- androidx.annotation:annotation:1.9.1 (*)
-| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
-| | | +--- androidx.room:room-ktx:2.8.3 (c)
-| | | +--- androidx.room:room-runtime:2.8.3 (c)
-| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
-| | +--- androidx.sqlite:sqlite:2.6.1
-| | | \--- androidx.sqlite:sqlite-android:2.6.1
-| | | +--- androidx.annotation:annotation:1.9.1 (*)
-| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
-| | | +--- androidx.sqlite:sqlite-framework:2.6.1 (c)
-| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
-| | +--- androidx.sqlite:sqlite-framework:2.6.1
-| | | \--- androidx.sqlite:sqlite-framework-android:2.6.1
-| | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*)
-| | | +--- androidx.sqlite:sqlite:2.6.1 (*)
-| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
-| | | +--- androidx.sqlite:sqlite:2.6.1 (c)
-| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
-| | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
-| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 -> 1.10.2 (*)
-| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 -> 1.10.2 (*)
-| | +--- org.jspecify:jspecify:1.0.0
-| | +--- androidx.room:room-common:2.8.3 (c)
-| | +--- androidx.room:room-ktx:2.8.3 (c)
-| | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
-| \--- androidx.room:room-ktx:2.8.3
-| +--- androidx.room:room-common:2.8.3 (*)
-| +--- androidx.room:room-runtime:2.8.3 (*)
-| +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
-| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 -> 1.10.2 (*)
-| +--- androidx.room:room-common:2.8.3 (c)
-| +--- androidx.room:room-runtime:2.8.3 (c)
-| \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
++--- project :libs:editor
+| +--- org.wordpress.gutenbergkit:android:v0.11.1
+| | +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21 -> 2.2.10 (*)
+| | +--- androidx.core:core-ktx:1.13.1 -> 1.16.0 (*)
+| | +--- androidx.appcompat:appcompat:1.7.0 -> 1.7.1 (*)
+| | +--- com.google.android.material:material:1.12.0 (*)
+| | +--- androidx.webkit:webkit:1.11.0 -> 1.14.0 (*)
+| | +--- com.google.code.gson:gson:2.8.9 -> 2.13.2
+| | | \--- com.google.errorprone:error_prone_annotations:2.41.0
+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2 (*)
+| | \--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 -> 2.2.21 (*)
+| \--- com.automattic.tracks:crashlogging:6.0.6
+| \--- io.sentry:sentry-android-core -> 8.18.0
+| \--- androidx.lifecycle:lifecycle-common-java8:2.2.0 -> 2.10.0
+| \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
-\--- org.wordpress.gutenbergkit:android:v0.10.2 (*)
++--- project :libs:fluxc
+| +--- com.github.chuckerteam.chucker:library:4.2.0
+| | +--- org.jetbrains.kotlin:kotlin-stdlib:2.2.0 -> 2.2.21 (*)
+| | +--- com.google.android.material:material:1.12.0 (*)
+| | +--- androidx.constraintlayout:constraintlayout:2.2.1 (*)
+| | +--- androidx.palette:palette-ktx:1.0.0
+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.2.50 -> 2.2.21 (*)
+| | | \--- androidx.palette:palette:1.0.0
+| | | +--- androidx.core:core:1.0.0 -> 1.16.0 (*)
+| | | \--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
+| | +--- androidx.activity:activity-ktx:1.10.1 (*)
+| | +--- androidx.fragment:fragment-ktx:1.8.8 -> 1.8.9 (*)
+| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1 -> 2.10.0 (*)
+| | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.9.1 -> 2.10.0
+| | | +--- androidx.lifecycle:lifecycle-livedata:2.10.0 (*)
+| | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.10.0 (*)
+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:2.0.21 -> 2.2.21 (*)
+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0 -> 1.10.2 (*)
+| | | +--- androidx.lifecycle:lifecycle-common:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-livedata:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-livedata-core:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-process:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-runtime:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-runtime-compose:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-service:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-viewmodel:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0 (c)
+| | | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.10.0 (c)
+| | | \--- androidx.lifecycle:lifecycle-common-java8:2.10.0 (c)
+| | +--- androidx.room:room-ktx:2.7.2 -> 2.8.3
+| | | +--- androidx.room:room-common:2.8.3
+| | | | \--- androidx.room:room-common-jvm:2.8.3
+| | | | +--- androidx.annotation:annotation:1.9.1 (*)
+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
+| | | | +--- androidx.room:room-ktx:2.8.3 (c)
+| | | | +--- androidx.room:room-runtime:2.8.3 (c)
+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
+| | | +--- androidx.room:room-runtime:2.8.3
+| | | | \--- androidx.room:room-runtime-android:2.8.3
+| | | | +--- androidx.annotation:annotation:1.9.1 (*)
+| | | | +--- androidx.annotation:annotation-experimental:1.5.0 -> 1.5.1 (*)
+| | | | +--- androidx.arch.core:core-runtime:2.2.0 (*)
+| | | | +--- androidx.collection:collection:1.5.0 (*)
+| | | | +--- androidx.room:room-common:2.8.3 (*)
+| | | | +--- androidx.sqlite:sqlite:2.6.1
+| | | | | \--- androidx.sqlite:sqlite-android:2.6.1
+| | | | | +--- androidx.annotation:annotation:1.9.1 (*)
+| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
+| | | | | +--- androidx.sqlite:sqlite-framework:2.6.1 (c)
+| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
+| | | | +--- androidx.sqlite:sqlite-framework:2.6.1
+| | | | | \--- androidx.sqlite:sqlite-framework-android:2.6.1
+| | | | | +--- androidx.annotation:annotation:1.8.1 -> 1.9.1 (*)
+| | | | | +--- androidx.sqlite:sqlite:2.6.1 (*)
+| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
+| | | | | +--- androidx.sqlite:sqlite:2.6.1 (c)
+| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
+| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 -> 1.10.2 (*)
+| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 -> 1.10.2 (*)
+| | | | +--- org.jspecify:jspecify:1.0.0
+| | | | +--- androidx.room:room-common:2.8.3 (c)
+| | | | +--- androidx.room:room-ktx:2.8.3 (c)
+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
+| | | +--- org.jetbrains.kotlin:kotlin-stdlib -> 2.2.21 (*)
+| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 -> 1.10.2 (*)
+| | | +--- androidx.room:room-common:2.8.3 (c)
+| | | +--- androidx.room:room-runtime:2.8.3 (c)
+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.20 -> 2.2.21 (c)
+| | +--- androidx.room:room-runtime:2.7.2 -> 2.8.3 (*)
+| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2 (*)
+| | +--- com.google.code.gson:gson:2.13.1 -> 2.13.2 (*)
+| | +--- org.brotli:dec:0.1.2
+| | +--- com.squareup.okhttp3:okhttp:4.12.0 -> 5.3.2 (*)
+| | +--- com.squareup.okhttp3:okhttp -> 5.3.2 (*)
+| | \--- androidx.databinding:viewbinding:8.11.1 (*)
+| +--- androidx.room:room-runtime:2.8.3 (*)
+| \--- androidx.room:room-ktx:2.8.3 (*)
++--- org.wordpress.gutenbergkit:android:v0.11.1 (*)
++--- androidx.work:work-runtime:2.11.0
+| \--- androidx.lifecycle:lifecycle-service:2.6.2 -> 2.10.0
+| \--- androidx.lifecycle:lifecycle-livedata-ktx:2.10.0 (c)
+\--- com.github.chuckerteam.chucker:library:4.2.0 (*) |
Contributor
Project manifest changes for WordPressThe following changes in the --- ./build/reports/diff_manifest/WordPress/wordpressVanillaRelease/base_manifest.txt 2025-12-02 18:42:26.752531601 +0000
+++ ./build/reports/diff_manifest/WordPress/wordpressVanillaRelease/head_manifest.txt 2025-12-02 18:43:16.172943961 +0000
@@ -67,7 +67,12 @@
</intent>
<!-- required for Android 11 (API level 30) or higher -->
<package android:name="com.jetpack.android" />
- <!-- Camera -->
+
+ <intent>
+ <action android:name="android.intent.action.CREATE_DOCUMENT" />
+
+ <data android:mimeType="*/*" />
+ </intent> <!-- Camera -->
<intent>
<action android:name="android.media.action.IMAGE_CAPTURE" />
</intent> <!-- Docs -->
@@ -96,7 +101,9 @@
</intent>
</queries>
- <uses-permission android:name="android.permission.WAKE_LOCK" />
+ <uses-permission
+ android:name="android.permission.WAKE_LOCK"
+ android:maxSdkVersion="25" />
<permission
android:name="org.wordpress.android.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
@@ -1203,6 +1210,36 @@
android:theme="@style/Base.ImageEditorTheme" >
</activity>
<activity
+ android:name="com.chuckerteam.chucker.internal.ui.MainActivity"
+ android:label="@string/chucker_name"
+ android:launchMode="singleTask"
+ android:taskAffinity="com.chuckerteam.chucker.task"
+ android:theme="@style/Chucker.Theme" />
+ <activity
+ android:name="com.chuckerteam.chucker.internal.ui.transaction.TransactionActivity"
+ android:parentActivityName="com.chuckerteam.chucker.internal.ui.MainActivity"
+ android:theme="@style/Chucker.Theme" />
+
+ <service
+ android:name="com.chuckerteam.chucker.internal.support.ClearDatabaseService"
+ android:exported="false"
+ android:permission="android.permission.BIND_JOB_SERVICE" />
+
+ <receiver
+ android:name="com.chuckerteam.chucker.internal.support.ClearDatabaseJobIntentServiceReceiver"
+ android:exported="false" />
+
+ <provider
+ android:name="com.chuckerteam.chucker.internal.support.ChuckerFileProvider"
+ android:authorities="org.wordpress.android.com.chuckerteam.chucker.provider"
+ android:exported="false"
+ android:grantUriPermissions="true" >
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/chucker_provider_paths" />
+ </provider>
+
+ <activity
android:name="org.wordpress.android.editor.WPGutenbergWebViewActivity"
android:theme="@style/Base.GutenbergWebView" />
<activityGo to https://buildkite.com/automattic/wordpress-android/builds/24060/canvas?sid=019ae05a-4a54-42a1-845a-625710d8b800, click on the |
Contributor
Project manifest changes for WordPressThe following changes in the --- ./build/reports/diff_manifest/WordPress/jetpackVanillaRelease/base_manifest.txt 2025-12-02 18:42:10.901478206 +0000
+++ ./build/reports/diff_manifest/WordPress/jetpackVanillaRelease/head_manifest.txt 2025-12-02 18:42:59.901721758 +0000
@@ -66,7 +66,12 @@
</intent>
<!-- required for Android 11 (API level 30) or higher -->
<package android:name="com.jetpack.android" />
- <!-- Camera -->
+
+ <intent>
+ <action android:name="android.intent.action.CREATE_DOCUMENT" />
+
+ <data android:mimeType="*/*" />
+ </intent> <!-- Camera -->
<intent>
<action android:name="android.media.action.IMAGE_CAPTURE" />
</intent> <!-- Docs -->
@@ -95,7 +100,9 @@
</intent>
</queries>
- <uses-permission android:name="android.permission.WAKE_LOCK" />
+ <uses-permission
+ android:name="android.permission.WAKE_LOCK"
+ android:maxSdkVersion="25" />
<permission
android:name="com.jetpack.android.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"
@@ -1230,6 +1237,36 @@
android:theme="@style/Base.ImageEditorTheme" >
</activity>
<activity
+ android:name="com.chuckerteam.chucker.internal.ui.MainActivity"
+ android:label="@string/chucker_name"
+ android:launchMode="singleTask"
+ android:taskAffinity="com.chuckerteam.chucker.task"
+ android:theme="@style/Chucker.Theme" />
+ <activity
+ android:name="com.chuckerteam.chucker.internal.ui.transaction.TransactionActivity"
+ android:parentActivityName="com.chuckerteam.chucker.internal.ui.MainActivity"
+ android:theme="@style/Chucker.Theme" />
+
+ <service
+ android:name="com.chuckerteam.chucker.internal.support.ClearDatabaseService"
+ android:exported="false"
+ android:permission="android.permission.BIND_JOB_SERVICE" />
+
+ <receiver
+ android:name="com.chuckerteam.chucker.internal.support.ClearDatabaseJobIntentServiceReceiver"
+ android:exported="false" />
+
+ <provider
+ android:name="com.chuckerteam.chucker.internal.support.ChuckerFileProvider"
+ android:authorities="com.jetpack.android.com.chuckerteam.chucker.provider"
+ android:exported="false"
+ android:grantUriPermissions="true" >
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/chucker_provider_paths" />
+ </provider>
+
+ <activity
android:name="org.wordpress.android.editor.WPGutenbergWebViewActivity"
android:theme="@style/Base.GutenbergWebView" />
<activityGo to https://buildkite.com/automattic/wordpress-android/builds/24060/canvas?sid=019ae05a-4a55-447f-8456-397da1321243, click on the |
Contributor
Author
|
Adding These are integration/wiring classes that wrap external dependencies (Chucker, OkHttp). Unit tests would primarily mock these dependencies without catching real bugs. The meaningful testing is done manually - verifying requests actually appear in Chucker across different network paths (FluxC, wordpress-rs, GutenbergKit), as demonstrated in the test plan GIFs. |
Contributor
|
| App Name | WordPress | |
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr22381-dc1e76f | |
| Commit | dc1e76f | |
| Direct Download | wordpress-prototype-build-pr22381-dc1e76f.apk |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
WordPress/src/main/java/org/wordpress/android/support/main/ui/SupportActivity.kt
Fixed
Show fixed
Hide fixed
WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt
Fixed
Show fixed
Hide fixed
WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java
Fixed
Show fixed
Hide fixed
Contributor
|
| App Name | Jetpack | |
| Flavor | Jalapeno | |
| Build Type | Debug | |
| Version | pr22381-dc1e76f | |
| Commit | dc1e76f | |
| Direct Download | jetpack-prototype-build-pr22381-dc1e76f.apk |
- Add @nonnull annotation to ApplicationModule parameter - Add @SuppressLint("InflateParams") for AlertDialog custom title inflation - Update SupportViewModelTest with appPrefsWrapper and experimentalFeatures - Update DataViewViewModelTest with trackNetworkRequestsInterceptor - Update ExperimentalFeaturesViewModelTest with appPrefsWrapper - Update TermsViewModelTest with trackNetworkRequestsInterceptor
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## trunk #22381 +/- ##
==========================================
- Coverage 39.02% 38.96% -0.06%
==========================================
Files 2203 2205 +2
Lines 106351 106648 +297
Branches 15061 15085 +24
==========================================
+ Hits 41501 41555 +54
- Misses 61359 61601 +242
- Partials 3491 3492 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
adalpari
reviewed
Dec 2, 2025
WordPress/src/main/java/org/wordpress/android/support/main/ui/SupportActivity.kt
Outdated
Show resolved
Hide resolved
adalpari
reviewed
Dec 2, 2025
| var selectedIndex = periods.indexOf(currentPeriod) | ||
|
|
||
| @SuppressLint("InflateParams") // Parent is null because AlertDialog attaches it internally | ||
| val titleView = layoutInflater.inflate(R.layout.dialog_title_with_message, null).apply { |
Contributor
There was a problem hiding this comment.
❓ Feels a bit odd to inflate a layout and a dialog inside a Jetpack Compose activity. What about using a state instead of an event, and a composable AlertDialog?
Note: If we need to unblock this PR, I'm happy to approve it as it is, and work on the changes later.
Contributor
Author
There was a problem hiding this comment.
Should be addressed in 6505f42, let me know what you think!
adalpari
reviewed
Dec 2, 2025
| appPrefsWrapper = appPrefsWrapper, | ||
| experimentalFeatures = experimentalFeatures | ||
| ) | ||
| } |
Contributor
There was a problem hiding this comment.
⛏️ It would be great to add some simple tests for the new functionality in the VM
Contributor
Author
There was a problem hiding this comment.
Should be addressed in f20cacc
Note that I followed the existing patterns in this test file by duplicating the account setup mocks. As a future improvement, we could extract these into shared helpers (e.g., setupLoggedInAccountMocks() / setupLoggedOutAccountMocks()) to improve readability across all init tests.
adalpari
reviewed
Dec 2, 2025
| } | ||
|
|
||
| fun onEnableTrackingConfirmed(period: NetworkRequestsRetentionPeriod) { | ||
| appPrefsWrapper.trackNetworkRequestsRetentionPeriod = period.value |
Contributor
There was a problem hiding this comment.
I suggest using viewModelScope in these functions as well, just to be sure we are not blocking the UI thread
Contributor
Author
There was a problem hiding this comment.
Could you clarify which operation you're concerned might block the UI thread? The SharedPreferences writes use apply() (async), and the StateFlow updates are in-memory. Happy to wrap in viewModelScope if there's a specific concern I'm missing!
…tentionPeriodDisplayString into separate methods for better readability and reusability: - getRetentionPeriodStringRes: returns the string resource ID - getRetentionPeriodDisplayString: resolves it to a String Changes: - Extract resource ID mapping to dedicated method - Simplify the display string method to delegate Co-authored-by: Adalberto Plaza <[email protected]>
Replace View-based AlertDialogs with Compose AlertDialogs in SupportScreen. This addresses PR feedback about using Compose dialogs in a Compose activity. Changes: - Add reusable SingleChoiceAlertDialog component - Convert DialogEvent (SharedFlow) to DialogState (StateFlow) in ViewModel - Add EnableTrackingDialog and DisableTrackingDialog composables - Remove XML layout inflation and View-based dialog code from Activity
Cover the new network tracking dialog state management with tests for: - init() network debugging state based on feature flag and preferences - onNetworkTrackingToggle showing enable/disable dialogs - onEnableTrackingConfirmed/onDisableTrackingConfirmed state updates - onDialogDismissed without side effects - onRetentionPeriodSelected updating dialog state Changes: - Add 10 new tests in SupportViewModelTest - Move init-related tests to existing init() region - Create new region for dialog interaction tests
Contributor
Author
|
Regarding SonarQube warnings:
|
adalpari
approved these changes
Dec 2, 2025
Contributor
adalpari
left a comment
adalpari
left a comment
There was a problem hiding this comment.
LGTM and works as expected! Thanks for jumping into the network tracker!
🚢
dcalhoun
reviewed
Dec 2, 2025
Member
dcalhoun
left a comment
dcalhoun
left a comment
There was a problem hiding this comment.
I suggest we await a fix in a new release from GutenbergKit before merging this.
Also, I noted what appears to be a crash in Chucker when quickly switching tabs, but this may be unrelated to our code. I share it nonetheless.
Chucker crash on tab switch
Screen_Recording_20251202_100728_Jetpack.Pre-Alpha.mp4
Contributor
Author
I was able to reproduce this crash. The bug is in Chucker UI implementation and unfortunately I don't think there is anything we can do on our end. cc @jkmassel |
Contributor
Do we need to give the user access to this screen? Can we log it internally and access it any other way? |
Contributor
Author
If we are using Chucker, we have to use its UI and there is no way to access the data as far as I can tell. We discussed the possibility of building something in-house with @jkmassel and the proposed I have not been a big fan of using Chucker, but it does make sense to use that initially to test the flow and replace it with our implementation later. I think that's one reason Jeremy wanted to put this behind a feature flag as we currently don't expect end users to use this feature. |
|
Member
|
@oguzkocer I note the GutenbergKit network activity now displays in Chucker, but the timestamp and duration appear incorrect. Is the data provided by GutenbergKit incompatible or empty? Incorrect GutenbergKit timestamps and durations screenshot
|
Contributor
Author
@dcalhoun This is a known limitation of the replay approach. The
Chucker doesn't have an API to inject custom timestamps - it always uses its own timing. We could simulate duration by adding a wait time to the replay, but that adds overhead without much benefit. If we switch to an in-house tracking implementation in the future, we'd be able to record these values correctly. |
Member
|
@oguzkocer ah, thank you for explaining. The current approach makes sense to me. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Integrates Chucker to allow users to inspect HTTP traffic for troubleshooting network issues when contacting support.
Key points:
Authorization,Cookie,Set-Cookie,X-WP-Nonce)NETWORK_DEBUGGINGexperimental feature flagChanges
TrackNetworkRequestsInterceptorwrapper around Chucker in FluxCWpApiClientProvider,WPcomLoginClient,WpLoginClientGutenbergKitNetworkLogger(replays JS fetch through OkHttp)UndeletablePrefKey) to support login flow debuggingTest Plan
1. Feature toggle flow (see GIF 1)
Verify the following by following along with the GIF:
NETWORK_DEBUGGINGexperimental flag is disabled2. Network requests captured (see GIF 2)
Enable
GUTENBERG_KITandNETWORK_DEBUGGINGexperimental flags, then:Verify the following requests are captured:
users→ findGET /rest/v1.1/sites/{site_id}/userssubscribers→ findGET /wpcom/v2/sites/{site_id}/subscribersblock-editor→ findGET /wp-block-editor/v1/sites/{site_id}/settingschucker_pr_1.webm
chucker_pr_2.webm
Part of CMM-998